Moved things around and generally cleaned up.
added next and previous to Int
Recorded test results.