Almost done with my part of the mod