Addressed all of Todd’s comments and readded in all integration and commented out tests.