Sorry for all the commits, not really a way around this. More updates.