Inital commit, moving stuff all into alert