Added various objects and entities.  Not using factory, but normal objects.