Develop

Requesting to incorporate my code cleanup/refactoring and new DB object additions into your develop branch.