added angular stuff. not really tested