Got one state semi working, bed time...