Major progress update doing internal things