Finished implementing task-switching