V2.6 wip/physics

@ndushay