Timelapse Pull Request

Rebased the previous pull request to be coming into develop instead of master.