Refactor to include controller