Added todo's for Roel and me