Version 2

Added merging, and a better preview feature