CYB-110 Comments now persist through entire gallery

Long overdue PR. Tests should pass, will make a run through of actual functionality later today. 

Please comment if anything looks fishy; this is a huge PR, but it should be the last of its kind (thankfully).