Part 1 of a edit I'm working on