While running tests, found a bunch of extra DTO's and things that need to get added.  Solidifying the testing suites.