I didn't modify this in this PR, but don't worry, it's going to get a major refactor!