I gotta revamp this too with all this new stuff.