Working Angular, just needs filtering added