Possible implementation for #28

WIP