Fixed object conversion up to be a lot cleaner in preparation for adding rotation support