refactor(angular): WIP