Complete FSM structure and add collision manager