Wiki and Barrett

Finished wikipedia and barretts implementations. Program should be
completed for final now.