Finished the 'one grand patch' for OM. Now need to separate this into different files.