alarms on api
took away cruft
resolved merge conflicts. alarms with detail view