angularification work in progress