continued work on todos