Refactored Q/expandable tool to be more MVC