wip changes to avoid allocs and clientside model re-use