more work towards working version