Merged files

had issues with conflicting files - resolved now