Second very large commit.
In a working state with repetitions in images.