Simplified further and started creating menu for main()