Updated with work so far.
Resolved merge.