Added some lost files from the erroneus branch HEAD