Lots of changes, start to whip into shape