commented out some in-progress stuff to make this code testable