Version 2.0 pretty much done