More initial development

Almost done. Should wrap this up early next week.