So much awesomeness
Some big changes