All of this commented out code should go before we merge this.