submitting latest code

going to rest and continue in few hours later