Fill this in or defer it to a later branch?