So It seems I'll be able to stick to my own deadline and deliver this one by the end of this month! :)