Nearly ready for a beta release. All future commits will include changes.