Started adding testling capabilities