Finished adding Garage and modifications to main()