Tasks refactoring, now works outside admin controller