Changes galore
Merge Conflicts resolved