RC: Toggle rewrite (2/2)

PS2: Rebase

Change-Id: Idb9c658ae8a9682812c60f94088e5209bb120d61
RC: Add a little clarity to new toggle implementation

Change-Id: Id21c15cddb1c7de6b375c5f93ddb8bf412622d3a
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>