Started work on new avatar code