new Branch for changes
Stable, needs testing on device to see if Alarm actually works.
refactoring conv