Merging all of Chris' changes with new commerce stuff

yeah this one's a big one...