2) seems like the right approach most likely.