Changed a lot of stuff. fixed nothing yet. we need to learn how to branch
merged