V2/newsstack realignment

Merge for #175