Just some suggestions

Not meant to be merged in, I haven't tested it, just wanted to highlight a few things I may do differently.  This is an awesome idea! :)