Merge with Sam's working alarm 10.20pm
Pulling Sams code at 10.25pm
MJ: confirmed working alarm, queries ORIGIN servec perfectly