First stab at enhanced requirements prior to implementation.

@commuterjoy please review.