New fabfile that works