Get the basic stuff into master