updates to get these working definitely needs to be refactored for better use of angular