Changed more files and more are working