OTOH, we should hold off on adding the state machine functionality until we have more direction. No need to add complexity where it's not yet needed.