Major update! Now includes ERRORS!

updated to include future classes, thus the errors