-slowly but surely getting rid of the hardcoding