Salamander Slam

Other stuff from Dave