Bits of work done, Added the proper include bits, need to fix the Visual Studio BS