Initial check-in of draft extension code