Better business object hierarchy
Add calculus preview windows