Last commit before caching.
Started figuring out UnitTesting and Caching