just adding a few TODO's