FINALLY got order wazee denver javascripty business working
fix merge conflicts
fix more merge conflicts