Initial implementation of #3