Add ability for user to enter their own name. Small amount of refactoring.