Goodness

Added some more scenarios and cleaned up the JS