Final horrid mess

It adds stuff and generally works a little