About to make some huge organizational changes to code

need to make entire code work for partial suns