First attempt at new deployment setup