Did a lot of mappack work and added client notifications