All classes in working state, everything functional. Still some cleanup to do