WIP continues for version 2.0