Migration/scaffold

Scaffold generator for migration works great. We have a little cleaning up to do.