Added more functionality, beginning work on detecting field parent structures