Nearly done, just some bells and whistles, and checking for best practices, and instruments

Signed-off-by: geoffsdavis <geoffsdavis@yahoo.com>