Got lots done, fixed up the functions

Still have to fix/do the file scanner