Add images + fix stupid bug with generic arrays