Finished breaking everthing. Moving onto ex 23
Merged branch with calling branch and adjusted Makefile's clean