Scrapping the whole thing and starting over, but now it's way better.