WIP -- Commented out some formatting code, added stopPropagation