Completed the TODO tasks