WIP: Feature/117 rework train if

[benHeid]

Description

Discussed in #117 and #116

Related Issues

closes #117

Before submitting

• Was this discussed/approved via a GitHub issue? (not for typos)
• Did you make sure your PR does only one thing, instead of bundling different changes together?
• Did you make sure to update the documentation with your changes? (if necessary)
• Did you write any new necessary tests? (not for typos and docs)
• Did you verify new and existing tests pass locally with your changes?
• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• My changes generate no new warnings
• Did you update the CHANGELOG

PR review

Anyone in the community is free to review the PR once the tests have passed.

• Is this pull request ready for review? (if not, please submit in draft mode)
• Check that all items from Before submitting are resolved
• Make sure the title is self-explanatory and the description concisely explains the PR
• Add labels and milestones to the PR so it can be classified