Development/zza

Simplification and cleanup of zza sample