Began adding boilerplate classes per #4