PR from GCI staging_done branch

Had to do some conflict resolution as well. :|
Can use self.table, or otherwise shouldn't assume model loaded.