Changes the way objects are added to the general object

#21
Resolves #19
#17
#16