Replaced the broken files. Still needing to fix a unit test
Resolved merge conflicts