Unfinished changes supporting storing cache for later. Documentation has been improved with more notes and headers on class. Minor changes to remove warnings