Changing layers to be stored as a simple list instead of separated will make this much nicer to deal with.