Big Pull Request for lots of Avatar Touch Features