including new files
new files
normals mostly done