Removed all of the hardcoded values (I think)