Nov sprint aggr - Implemententions for remaining issues 

Please don't merge yet ... some commits remaining to be pushed