Shit Code
Cleaning Julien's Crap
merge