another revision. looking pretty clean.