refactored expression to avoid returning null
engine refactor
switched to spring for di
started to switch Collection to Set
engine test
more