Still crashes, but I wanted to commit this