diff --git a/day-13/benchmark b/day-13/benchmark
new file mode 100644
index 0000000..e6a4b54
--- /dev/null
+++ b/day-13/benchmark
@@ -0,0 +1,15 @@
+goos: linux
+goarch: amd64
+pkg: github.com/onyx-and-iris/aoc2024/day-13
+cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
+BenchmarkSolve-12    	1000000000	         0.001372 ns/op
+BenchmarkSolve-12    	1000000000	         0.001271 ns/op
+BenchmarkSolve-12    	1000000000	         0.001405 ns/op
+BenchmarkSolve-12    	1000000000	         0.001325 ns/op
+BenchmarkSolve-12    	1000000000	         0.001289 ns/op
+BenchmarkSolve-12    	1000000000	         0.001294 ns/op
+BenchmarkSolve-12    	1000000000	         0.001290 ns/op
+BenchmarkSolve-12    	1000000000	         0.001334 ns/op
+BenchmarkSolve-12    	1000000000	         0.001289 ns/op
+BenchmarkSolve-12    	1000000000	         0.001349 ns/op
+ok  	github.com/onyx-and-iris/aoc2024/day-13	0.112s
diff --git a/day-13/cmd/cli/main.go b/day-13/cmd/cli/main.go
new file mode 100644
index 0000000..48d7d6c
--- /dev/null
+++ b/day-13/cmd/cli/main.go
@@ -0,0 +1,41 @@
+/********************************************************************************
+    Advent of Code 2024 - day-13
+********************************************************************************/
+
+package main
+
+import (
+	"embed"
+	"flag"
+	"fmt"
+	"slices"
+
+	log "github.com/sirupsen/logrus"
+
+	problems "github.com/onyx-and-iris/aoc2024/day-13"
+)
+
+//go:embed testdata
+var files embed.FS
+
+func main() {
+	filename := flag.String("f", "input.txt", "input file")
+	loglevel := flag.Int("l", int(log.InfoLevel), "log level")
+	flag.Parse()
+
+	if slices.Contains(log.AllLevels, log.Level(*loglevel)) {
+		log.SetLevel(log.Level(*loglevel))
+	}
+
+	data, err := files.ReadFile(fmt.Sprintf("testdata/%s", *filename))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	one, two, err := problems.Solve(data)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fmt.Printf("solution one: %d\nsolution two: %d\n", one, two)
+}
diff --git a/day-13/go.mod b/day-13/go.mod
new file mode 100644
index 0000000..5176b58
--- /dev/null
+++ b/day-13/go.mod
@@ -0,0 +1,7 @@
+module github.com/onyx-and-iris/aoc2024/day-13
+
+go 1.23.3
+
+require github.com/sirupsen/logrus v1.9.3
+
+require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
diff --git a/day-13/go.sum b/day-13/go.sum
new file mode 100644
index 0000000..21f9bfb
--- /dev/null
+++ b/day-13/go.sum
@@ -0,0 +1,15 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/day-13/internal/machine/machine.go b/day-13/internal/machine/machine.go
new file mode 100644
index 0000000..cf4fbe9
--- /dev/null
+++ b/day-13/internal/machine/machine.go
@@ -0,0 +1,39 @@
+package machine
+
+import "fmt"
+
+type Button struct {
+	X int
+	Y int
+}
+
+type Prize struct {
+	X int
+	Y int
+}
+
+type Machine struct {
+	A     Button
+	B     Button
+	Prize Prize
+}
+
+func New(btnA, btnB, prz []string) *Machine {
+	return &Machine{
+		A:     Button{X: mustConv(btnA[2]), Y: mustConv(btnA[3])},
+		B:     Button{X: mustConv(btnB[2]), Y: mustConv(btnB[3])},
+		Prize: Prize{X: mustConv(prz[1]), Y: mustConv(prz[2])},
+	}
+}
+
+func (m *Machine) String() string {
+	return fmt.Sprintf(
+		"ButtonA: (%d,%d) ButtonB: (%d,%d) Prize: (%d,%d)",
+		m.A.X,
+		m.A.Y,
+		m.B.X,
+		m.B.Y,
+		m.Prize.X,
+		m.Prize.Y,
+	)
+}
diff --git a/day-13/internal/machine/util.go b/day-13/internal/machine/util.go
new file mode 100644
index 0000000..c5906c0
--- /dev/null
+++ b/day-13/internal/machine/util.go
@@ -0,0 +1,11 @@
+package machine
+
+import "strconv"
+
+func mustConv(s string) int {
+	n, err := strconv.Atoi(s)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
diff --git a/day-13/internal/one/benchmark b/day-13/internal/one/benchmark
new file mode 100644
index 0000000..3e27c78
--- /dev/null
+++ b/day-13/internal/one/benchmark
@@ -0,0 +1,6 @@
+goos: linux
+goarch: amd64
+pkg: github.com/onyx-and-iris/aoc2024/day-13/internal/one
+cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
+BenchmarkSolve-12    	1000000000	         0.0006521 ns/op
+ok  	github.com/onyx-and-iris/aoc2024/day-13/internal/one	0.010s
diff --git a/day-13/internal/one/solve.go b/day-13/internal/one/solve.go
new file mode 100644
index 0000000..537010d
--- /dev/null
+++ b/day-13/internal/one/solve.go
@@ -0,0 +1,40 @@
+package one
+
+import (
+	"bytes"
+	"math"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/onyx-and-iris/aoc2024/day-13/internal/util"
+)
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	machines, err := util.ParseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	var total int
+	for _, m := range machines {
+		denominator := ((m.A.X * m.B.Y) - (m.B.X * m.A.Y))
+		a_numerator := ((m.Prize.X * m.B.Y) - (m.Prize.Y * m.B.X))
+		b_numerator := ((m.Prize.Y * m.A.X) - (m.Prize.X * m.A.Y))
+
+		a := float64(a_numerator) / float64(denominator)
+		b := float64(b_numerator) / float64(denominator)
+
+		if a != math.Round(a) || b != math.Round(b) {
+			continue
+		}
+
+		log.Debug(a, b)
+
+		if a > 0 && b > 0 {
+			total += 3*int(a) + int(b)
+		}
+	}
+
+	return total, nil
+}
diff --git a/day-13/internal/one/solve_internal_test.go b/day-13/internal/one/solve_internal_test.go
new file mode 100644
index 0000000..e5fd7ea
--- /dev/null
+++ b/day-13/internal/one/solve_internal_test.go
@@ -0,0 +1,15 @@
+package one
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+)
+
+//go:embed testdata/input.txt
+var data []byte
+
+func BenchmarkSolve(b *testing.B) {
+	os.Stdout, _ = os.Open(os.DevNull)
+	Solve(data)
+}
diff --git a/day-13/internal/two/benchmark b/day-13/internal/two/benchmark
new file mode 100644
index 0000000..cae67b5
--- /dev/null
+++ b/day-13/internal/two/benchmark
@@ -0,0 +1,6 @@
+goos: linux
+goarch: amd64
+pkg: github.com/onyx-and-iris/aoc2024/day-13/internal/two
+cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
+BenchmarkSolve-12    	1000000000	         0.0006422 ns/op
+ok  	github.com/onyx-and-iris/aoc2024/day-13/internal/two	0.010s
diff --git a/day-13/internal/two/solve.go b/day-13/internal/two/solve.go
new file mode 100644
index 0000000..59ef429
--- /dev/null
+++ b/day-13/internal/two/solve.go
@@ -0,0 +1,45 @@
+package two
+
+import (
+	"bytes"
+	"math"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/onyx-and-iris/aoc2024/day-13/internal/util"
+)
+
+const augment = 10e12
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	machines, err := util.ParseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	var total int
+	for _, m := range machines {
+		m.Prize.X += augment
+		m.Prize.Y += augment
+
+		denominator := ((m.A.X * m.B.Y) - (m.B.X * m.A.Y))
+		a_numerator := ((m.Prize.X * m.B.Y) - (m.Prize.Y * m.B.X))
+		b_numerator := ((m.Prize.Y * m.A.X) - (m.Prize.X * m.A.Y))
+
+		a := float64(a_numerator) / float64(denominator)
+		b := float64(b_numerator) / float64(denominator)
+
+		if a != math.Round(a) || b != math.Round(b) {
+			continue
+		}
+
+		log.Debug(a, b)
+
+		if a > 0 && b > 0 {
+			total += 3*int(a) + int(b)
+		}
+	}
+
+	return total, nil
+}
diff --git a/day-13/internal/two/solve_internal_test.go b/day-13/internal/two/solve_internal_test.go
new file mode 100644
index 0000000..ecb05d5
--- /dev/null
+++ b/day-13/internal/two/solve_internal_test.go
@@ -0,0 +1,15 @@
+package two
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+)
+
+//go:embed testdata/input.txt
+var data []byte
+
+func BenchmarkSolve(b *testing.B) {
+	os.Stdout, _ = os.Open(os.DevNull)
+	Solve(data)
+}
diff --git a/day-13/internal/util/util.go b/day-13/internal/util/util.go
new file mode 100644
index 0000000..3057b24
--- /dev/null
+++ b/day-13/internal/util/util.go
@@ -0,0 +1,56 @@
+package util
+
+import (
+	"bufio"
+	"io"
+	"regexp"
+	"strconv"
+
+	"github.com/onyx-and-iris/aoc2024/day-13/internal/machine"
+)
+
+var (
+	reButton = regexp.MustCompile(`Button (?P<identifier>[A|B]): X\+(?P<xdigit>\d+), Y\+(?P<ydigit>\d+)`)
+	rePrize  = regexp.MustCompile(`Prize: X\=(?P<xdigit>\d+), Y\=(?P<ydigit>\d+)`)
+)
+
+func ParseLines(r io.Reader) ([]*machine.Machine, error) {
+	var matches [][]string
+
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		lineBytes := scanner.Bytes()
+		if len(lineBytes) == 0 {
+			continue
+		}
+
+		var m []string
+		switch line := string(lineBytes); {
+		case reButton.Match(lineBytes):
+			m = reButton.FindStringSubmatch(line)
+		case rePrize.Match(lineBytes):
+			m = rePrize.FindStringSubmatch(line)
+		}
+
+		matches = append(matches, m)
+	}
+
+	var machines []*machine.Machine
+	for i := 0; i < len(matches); i += 3 {
+		machines = append(machines, machine.New(matches[i], matches[i+1], matches[i+2]))
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
+	return machines, nil
+}
+
+func mustConv(s string) int {
+	n, err := strconv.Atoi(s)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
diff --git a/day-13/makefile b/day-13/makefile
new file mode 100644
index 0000000..7c3f2b2
--- /dev/null
+++ b/day-13/makefile
@@ -0,0 +1,30 @@
+program = day-13
+
+GO = go
+SRC_DIR := src
+BIN_DIR := bin
+
+EXE := $(BIN_DIR)/$(program)
+
+.DEFAULT_GOAL := build
+
+.PHONY: fmt vet build bench clean
+fmt:        
+	$(GO) fmt ./...
+
+vet: fmt        
+	$(GO) vet ./...
+
+build: vet | $(BIN_DIR)
+	$(GO) build -o $(EXE) ./$(SRC_DIR)
+
+bench:
+	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
+	$(GO) test ./internal/two/ -bench=. > internal/two/benchmark
+	$(GO) test . -count=10 -bench=. > benchmark
+
+$(BIN_DIR):
+	@mkdir -p $@
+
+clean:
+	@rm -rv $(BIN_DIR)
diff --git a/day-13/solve.go b/day-13/solve.go
new file mode 100644
index 0000000..6f8d26b
--- /dev/null
+++ b/day-13/solve.go
@@ -0,0 +1,20 @@
+package daythirteen
+
+import (
+	"github.com/onyx-and-iris/aoc2024/day-13/internal/one"
+	"github.com/onyx-and-iris/aoc2024/day-13/internal/two"
+)
+
+func Solve(buf []byte) (int, int, error) {
+	answerOne, err := one.Solve(buf)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	answerTwo, err := two.Solve(buf)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	return answerOne, answerTwo, nil
+}
diff --git a/day-13/solve_internal_test.go b/day-13/solve_internal_test.go
new file mode 100644
index 0000000..2b0cee6
--- /dev/null
+++ b/day-13/solve_internal_test.go
@@ -0,0 +1,15 @@
+package daythirteen
+
+import (
+	_ "embed"
+	"os"
+	"testing"
+)
+
+//go:embed testdata/input.txt
+var data []byte
+
+func BenchmarkSolve(b *testing.B) {
+	os.Stdout, _ = os.Open(os.DevNull)
+	Solve(data)
+}