Initial implementaiton of #27