Forced some function arguments to take in a specific array size
Undid some code clean up changes, and changed how some includes work