Lots of updates to prepare for V2