Added Colin and Jordan's commits PLEASE MERGE BEFORE EDITING!!!!