Initial work
Added missing views