Added waypoints and started working on the gallery