Refactored, changed images, prep for mass dot implementation.