Added basic functionality + Database Changes