GSoC #45

I almost feel like laughing now. Two days of good health and I fall ill again. :/
Anyways, I made progress on fixing oil and hope to complete it in a day or two depending on how fast I recover.