This commit is messy, forgot how to use git and wasnt commiting changed files.