Fixed miscellaneous issues

-Added makefile
-updated method declaration
-fixed a number of include statements
Do I need hardcoded paths, or can I just remove the paths all together?