Finish Merge c

I should stop lying. I'm tired. WILL NOT BUILD. Needs bugfixing.