0.4 migration

This uses the newest API from framework.  Please approve