This commit sucks because I have lost most of my changes...