decent state

still needs some graphic love