Photocell2 -> Refactor Photocell2 to reduce code.  Fix propogation bug.