Fixed Issue 0000047.
Rewrote core addins to fix issue 0000045.