Initial port of the code from the plugin - lots of small things to fix.