Added notifications etc.

and moved stuff