added in light bucket, reworked IDs