First draft of goalkeeper states done.