Working on extracting method signatures
Resolved merge conflicts