Updated changes
-Pendingintent now working yet, need fix