-avoid calls to lightning-bolt where possible.
-more logging
logging starting to make sense