Done some TODO's