Developmental

Merged all the files