Also change function sig to be shorter
Still needs to handle the following: * Correctly adapt to augmentation strings * Correctly parse instructions