Build out more of base. Application almost completed