Keep it even more tidy!
Mirror both variants and add TODOs