Work in progress commit. Switching to postgres / new class system.