Make note of some TODO's