Overhaul to Database and System