Updating main branch

Creating a pull request for commenting ability
Could you use individual fields here?  Then you don't have to worry about types later on.