Changes

Needs to be fixed later, git is a mess
???