Some renaming for the sake of organization
Adds body and rearanges extractors
Finishes it