Done. Went with the first approach.