Fixed
Moved classes out of cached class
Working books :)