merge worms into master

All fxns more or less working now. Just need a bit of tinkering...