Added the current files from sapfo, modified enough to run