Secondary round of changes.

Trying to achieve constant on/off with push of momentary switch