Separate users and counties

Also made users an update replacement