Angular records refactor

We should convert this to using FormService as well