Moved object components in to observatory object to simplify passing of information in to while_state functions.