rearchitected a lot of the code base ... incomplete edits