all the pseudocode cleanup so it actually builds, just a skeleton