More Pages, Renamed Toolkit, More Tests

See Title
Merge pull request #21 from Orasi/Brian_Branch

More Pages, Renamed Toolkit, More Tests