Task/ionic refactor