Still working on expressions/queries. Not running currently but I think I have a good idea of how I need to organise it and some reduction/merging/rationalizing of classes