OPENUCB-348: Refactored, did some field renames, and commented out some troublesome update functions.