More code changes

Variable specs is going to be a nightmare :/