added Todo stuff