Wip

Get all of Niko's changes rebased and compiling, time to get to work