Did cleanup. Needs refactoring, tasks and home should be merged