Backed out behavior dependent on order type.  Partial addition of support for program selection by user

https://www.pivotaltracker.com/story/show/77058066