Made a few more changes, currently broken