More shapes imported; still need origin translation