Previous commit had only Martins functions! Added mine back in.