Big changes

It;s awesome