Josiah updates

New MVP needs work on push notification