more functionality outsourced in inspector.py