More progress on stuff