Version 2.0 where we start versions and a ton of cleanup