Bodie's branch

A crapload of additions.