Upgrade Mocha and Mochify to 2.0
WIP: Improve concept draft