OMG it compiles
slowely fixing things after a big refactor