Goal and Match Entities added, now this shit is broken