Initial commit to new style - lots of work to do