a few more places still need more work -- just added the stubs for a couple ideas that need more elaboration