dev: more angular wip