Feature/eip state machine