Ash/class vew

Merge