First cut at nicer, more feature rich deployment