AJ-1573 Initial Angular implementation.