Working towards support for images of different widths

Not in working state.