Hmm, I think I like the second option, but if you don't feel like implementing all that, then I would be fine with the first one.