CORE CLASSES - 6/3 - 6/7 Updates