Fixed Problem

I fixed the weird defining problem. I guess I included the header files
in the wrong classes.

It was just weird.

Need to do:
-COMMENT ALL CODE
-UPDATE UML
-debug
-encapsulate all the functions that can be encapsulated.