US: call it a module, not a class. Maybe.
typos
US: poor form WIP commit. Just keeping my code safe.