Back to a state that will build.

Put lights feature on hold. Needs a bit more fleshing out before it can be
added. Think about creating a branch first and work on it separately.