Working on task switch. Broken commit!