Created more base classes, expanded on database portion