Ovation 2.0 beta 1

Merging dev to master in preparation for beta 1