Resolves #109. Refactored cells into subclasses.