Removed angular stuff. I don’t think I will go this way