Started...
Continued...
More...
...
Bla
Bla
Bla.
Changed constructors to meet requirement.
Resolved merge conflict.
Resolved merge conflict.