This appears to be working

but I'm probably about to break it again as I continue developing. Enjoy it while you can!
Yep this things need to be removed