Added Basic class functionality, and testscript