Cleanup
Fix status notification conditions
Forgot to add Objects class to repo