review this https://github.com/pullfrog/colinhacks/pull/5