Tested adding new object. Refactoring code.