Focal: Want to see if this can be done yet.

Not sure if it needs more yet......

PS2:  Rebase
PS3:  You got me!  Fixed....

Change-Id: I5c1e93aa7bcf319a1d9be81e146174d010ce4ae7