Refactored task, added manually scaffolded things