This does #27 and #26, and should also do away with any copyright issues.