2.0 port

Now works under 2.0. The images still seem to merge together at some angles, I suspect because rotation has changed. Could probably be fixed by reworking them to have even dimensions.