Feature/more nuts

so far it's backwards compatible... i think ^_^