Added a whole bunch of Sharm's work