Sucessfully ported everything over to angular