modularized some more...
test scripty