Finalizing revamp, yay.