Finished combining.
Working on merging stuff.