More opcode work