W5-A4 TODO's completed and tests succeeded