Refactoring
wip
Transition completed
Merge branch 'master' of github.com:ftomassetti/lightmodels