5 star

Can someone please review the commits on the 5-star branch?  All of the items in #24 should have been addressed.