adding all the fun angular shit