Fixed class names and working on file saving still