states

finally, states where I want them. flashed out most of the vault stuff,
will finish tomorrow