Milestone 2.3

metric restructure. Move display logic away from xsjs files to client.