Added todo and refactored the sandbox a little bit.