Still a wip

Still a work in progress, but closer to working.

Signed-off-by: Joe Buck <jbbuck@gmail.com>