wip angularize