added todos
cleanup
cleanup