Initial commit of ongoing wired update

I'm going to recode the whole shit.