Committing code to try a new tact

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