Release/sundew

Merging work from prototype branch in to master.