mostly need to finish the border gen stuff