FINALIZED W/IAN'S CODE

It's all finished, all cohesive now