Improving the placeholders.  Still working on it.