Compile errors fixed. Deal with linker errors now