bulk commit :-)
first structural changes towards being node js plugin