WIP: Version 2.0 Initial Work