added angular and wired up an actual detection