Actually working commit. Now with proper updates woopy.