Tidy and clean up.

Now things are using NSNotificationCenter for some stuff