Finished Merge with all the new shit... yay?