Changed stuff around

First time committing with github, please nothing breaks!