mvvmed almost everything
refactoring
mvvmed almost everything
Merge pull request #1 from kneefer1/MVMMlighting

Merge with MVVMlighting