Bunch of changes to essentially get a servicable v0.1 happening