[DEV] Added controller and template to close #1