There's a decent amount of Hacks and TODO:s that need revisiting I should spend a bit of time cleaning up code 😔
