Done some of the TODO's