Working database, need to add db support to the app itself