Re-assembly Commit # 1

Beginning re-assembly of plugin... improving efficiency of command
checks and relocating them to the command executor.