Trying a new scheme for breaking things apart.
Release 0.3.1