Changed behavior of main (given professor instructions); Added new todo.