State Machine Added, proposal structure almost done