Move machine framework into base
incremental