Made more progress towards starting and ending matches, reoranized some stuff