It's pretty horrible to have a commit messing up 90% of the code and also stuff isn't really well organized, but probably it needed to be done...
