Rehaul to include database interface and start of implementation of the interface