gallery sort of working
merged