about to break everything again
Everything should be working again. Needs to be rebuilt and tested