cleaning up. #include are +- all broken. MakeFile has to be rewritten