first commit ... a lot to fix