Basic alert system implemented
Merged after conflict