I think maybeMachine like you suggested in the other PR is the way to go. I'll make some changes in that one.