Finished off some alert stuff (needs visually sorted), some notion of login mechanism, merged the charting files