WIP -- refactoring, waiting for test
WIP -- refactoring; replace the images