Initial commit

First cut of migration from old code