initial commit after tests ok