Big hyper commit with lot of things and changes.

Awesome commit ^^
</sarcastic>