Greatly improved deploy task