More states

Not certain on a few things I did -- left a comments as needed. Added state-dependent elements.