Mega commit

To tired to explain... Yeah, I know. Bad practice....