Similar to #24 The recommendation is to implement this ticket after #24 is done, or working tightly together with that issue
