added dll
get rid of static classes