Further work making plotting routines be independent in finding light properties etc.