Started to move click handling code over to touchListener class, updated report