Moving to using angular