Hopefully have things ready for a 1.0.0 release...