Added some grouping and shuffled some stories around.
Fleshed out a feature
Fixed broken int test.