Initial revision.
Addition of toggle method and cleanup.