Safe commit before attempting challenge - avatars work