latest db changes
resolve conflict
another cut with basic working gallery