starting work on Zapper's
Merging fix