For now, still going to clean it up a bit more.