Much progress; more later after I do some paying work

Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>