finished userInput stuff and main.c until merges can be made