Started adding gallery support