Prep

Refactored image generator.