Did some work on creating the alarm list

Also removed @Override that were pissing of eclipse