595-32 - Redesign Database System

*Finally* got this done.