Continue porting the gallery