Dans branch

Pulling to merge with dan.