I really like (**a lot **) what @mattpap has proposed... but I also think we can do it later in another PR.