Compiles, fixed all #include statements
Finished all methods.