More state stuff

Probably going rip everything out, get rid of the singletons