Post #1605013

@mattiem I commented out some code and took some things out. It works now but I suspect I'm going to hit this when we move on to Swift 6. I need to learn more about this because right now don't feel all that comfortable/ understand it fully.