Work on StaticCitizen