Still working on relay server and notifications
added
Still fixing old code