Re-implemented notifications to work with Services. Add two extra Services to test notifications