Next step in restoring beams module. Already prepared a placeholder for a Match class.