Branch/property delegation

We still need to change the documentation for these changes, but we are ready for code review!

@davideaster and @allisoncorey, would you mind doing the honors?