start organizing states a little better