fixed? grepping; added todos;