Closes #31 initial work for the signature change