add makeTasks function
restructure the where function
add other files