Initial functionality for applying templates
Tasks Filtering / Other Improvements