Finished moving the logic to scenes.  Renamed things for order.