added some TODO:s