Added primarybtnonenter
Added primarybtnonenter
Several intermediate changes