Added TODO's for when we want to make some methods public