This will be part of #77