Citybuilder now uses State system
State NullPointerException bug fixed