Beginning to Reorganize methods