reorganized the file directory
merged branch with master
This is getting rather hairy~
Made rough functions defining lower level buffer behavoir, debugging them all now