Add initial config class; work towards multiple image support
Initial go at multiple images
Multi-image support fixed