Songbird

The first chunk of the songbird request.  Also an important fix for the Beaver and a few other little things.