Initial step in response to Jeff's feedback (WIP).