Overhaul complete!  Bugs seem ironed out.  Simple dragon working.