New enhancements from our last meeting in Kontur

Nedd deploy