working on adding in metadata and cleaning up Model namespace of AppEngine