Task/Goal Entities + Refactoring in der App