Removal of database - 3 - WIP - now functioning without DB