Tackled the front of my rust issues