Fixed Activation/Deactivation bug.  Refactored EntryPoint.