Finished more of the op-code routine