added some TODO annotations