Made a first pass at making wvw code not suck (it still kinda does)