Almost everything we need in place, except for notification of new messages not working yet