Redid the template/overload system in random.t