Added some more stuff for fiddling with.