Added Classes

Nice! These typically go above the `initialize` so it's clear what has getters and setters.