Added and updated files. Still needs tweaking