[wip]More full slam