Updated to include suggestions from discussion!