Significant restructuring of javascript objects, more to come