Initial implementation of #28