Rework, expand, etc.

Signed-off-by: Chris Lamb <chris@thread.com>