Changes:

TEMPORARY Staging route change
General code cleanup