Made progress on stuff