Updated project, with object files instead of functions in headers (which was improper, lazy coding!)