prelim version of testing interface
Merge commit '9fe07e2bb2a9695ba825e091b72914ff7b0c064a' into prelim_test
Getting the basic functionality back