Build plan created separately (partway to #25)