Lots of changes including stubbing out an initial bootstrap