Still very broken but a little cleaner.