Much possibly functional refactoring
Ran into weird User table drop; will switch to full-pg