- added some TODO's