committing first working version