A bunch of rework and needed to introduce a bunch of container wrappers. Plus side, first scripted script pack worked! Downside, some tests are commented / need to be fixed