Objects are now separated. Added notifications/observers