Add better stack tracing - not done yet, just backup...