Started adding op-codes