683 Deployment

Resolves #683, still needs a bit of work