These have been implemented as part of #403, but I haven't tested them. Could @aidenmha provide suitable inputs for testing?
