Gallery half done
Resolve merge conflict
errr