Part2 of the project working, still need to clean stuff