Last update before I make horrific changes