moved into xcode project. CAN STILL COMPILE AND RUN WITH MAKEFILE, AS WELL AS XCODE