Additional work on main()