WIP -- refactoring; replace the images