Basic gallery functionality has been added, needs more cleanup