UNO: Ran some refactorings. Now time for some code review of main code.