Changed lots of shit to be more intuitive