Moved over classes and fixed a few merging issues