Ok should compile

Undid all my old mistakes and remade stuff so that it should compile
again