Commit befor the weekend. Not much of a progress...