Work in progress (switched data storage to db)