pulled in what I like from upstream.

Signed-off-by: deegs <dan@konemarketing.com>