Pushing to Staging

Jeffs and Marcellos refactoring.