removed test file and added TODOS