Started working on code patching.
Self-review