Working on less hardcoded consumables

Now with interfaces.