Updated Several Files, still working on base platform -AW