I quickly hacked in some depth of field this morning.  This has highlighted the need for a camera class that will generate its own rays to abstract this all away.