Got rid of tasks since this is done for the most part