commiting not working code - not even tested...sorry folks