Note: made two places in api implementation as unimplemented as
the instruction/type chnaged.