Kinda sorta getting somewhere
More shuffling. I think my namespaces are fucked
Started fixing compilation errors