== Uhm... 14 parts? == 

 It seems a bit ridiculous to split the history up into 14 parts... and even though three or four of those parts are already done, they're WAY too long. Can't this be trimmed considerably?