I'm fine with refinements to this happening in follow-up bugs.  This is probably OK for a first landing.