Work in progress m0.2

Prepping pull of WIP m0.2.