Updated to share space for if-else field types. Still need todo alias checking and updated to handle new in any order