Working on SAMZA-2 and SAMZA-3

[Chris Riccomini]

Hey Guys,

I'm taking these two:

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

Cheers,
Chris