WIP - refactoring images