Moved some TODO's around