Started dividing code into propper spots. Need to modify makefile more