Starting to add Trap instructions.
merging