Your comments

+1 for choice #1. Choice #2 would be just a nice to have for me.