Re-did my caching system and moved it to library.