Major refactoring to handle better image conversion, compression, and caching.  Still not complete.