Adding in basic modules, and fixing things.