Angular/rebase (FEAT) Completed rebase which integrated the other angular features