Package checking work-in-progress (not yet finished, but wanted to save work so far...)
no demo for now (causes problem anyhow)