Major Changes

Wrapped methods in JIg and Toggle functions