working though could use some more tweaks

Signed-off-by: Joseph Morse <tamed.lionheart@gmail.com>