Commit before I try and optimize everything because it's running super slow!