Fix #12 - Templates and app to tasks