Jason Hatchett

Everything up to Extensions done, some tests rewritten so they would work properly.