Added SetupTask (wip); more code cleanup