Added attributes and modifiers, classes are getting unruly, refactoring comes next.