progress on rewriting the experimental stuff