TODO tasks

Do the todo tasks to complete the assignment