zoom functionality well flushed out.
resolved merge conflits