Lot’s of refactoring.  Sent the 0.5 release out to Chris for testing.