Moving functions and making sure all stacks check for the method name see #2