Added everything but the setup script