nearing completion
Merge pull request #2 from radavis/moar_info

nearing completion