Moved presentation to a different class (not a true MVC, though...)