fabfile rework to make more general