More Merging

Release soon. You can build it if you want!