It works! (with hacks but still)

Remove the hacks and we'll be golden