Major update.  Codifiyng new settings + better keymapping, etc.