working on removing large swaths of now irrelevant code