I'm trying to make it better piece by piece...