Major redesign and restructuring - MUST RUN SYNCDB