Put some testing stuff back and added some to pims level