More Database Updates

Please DO NOT MERGE this until we have a chance to talk about it.