database super-simplification
committing for now. not tested.