Initial scaffolding complete, time to start adding features through
branches