change to typed objects - WIP