Refactored for OO/MVC