New Class + bug fixes 95% complete