SAMZA-2

[Chris Riccomini]

Hey Guys,

I've put up a patch with the bulk of the work done for SAMZA-2. I'm looking for 
code reviews.

    https://issues.apache.org/jira/browse/SAMZA-2

Please read the comments, as well.

Thanks!
Chris