Feature/angularized static