made changes to filetypes
refactored more, lots of work to do still