Fixed up the merge. Commented out code that did was not finished.