first commit with working version