v2.993 update for Spigot. Sorry for the large delta but I had to change
some fundimental class names. :-(