commit soon and often .. (nothing working by now ;)