Shuffle some things around. Added test.
v0.0.3
0.0.3