Started work on redoing parts of the mod