WIP of the angular related changes.