Complete revamp

wow