New Branch
Okay REALLY branched new class
Resolve merge conflict
New changes to the branch