more refactoring
Switched from KVO to NSNotification
this is a much nicer approach
Merge branch 'dev'