Removed a lot of the hardcoding