most new stuff
added testing framework