Created Crop Object and set up crops as objects
Resolved merge conflicts