pull all from nigels' github