Done all the TODO's