DO NOT MERGE!! Increased database and controller functionality (possibly
working)
yyan, pelynch