W6-A5 TODO's completed and tests succeeded