made structural changes and added apns stuff