Alarm Add-ons

Testing from developer - 11/12