Put a few of the extra modules required in.

Also, testing commit from my laptop. Should work.