Begin moving in code for pricing restructure; breaking changes.