Reworked code to use directives and services for better communication and siloing of code
Reworked code to use directives and services for better communication and siloing of code