My changes going in before Naartjie fucks things up