add todos, thanks revert!