#1 added angular skeleton