Halfway through adding support for multiple dimension items
Added tests, fixed common imports, other improvements