Elvin/master

Merging to master final work done leading up to SINY end.