Final Commit Before Refactor

Will be refactoring code to work properly with Entity Design.