lots of refactoring to begin adding moving of price inputs