Forgot to add this
Rearranged more stuff, externalized and defined all the scripts in each header for public access