moved to one script, closes #18