More work on 1.7.10 update, getting close to done