Adding Controller and Databases, work in progress ...