Just very minor changes to Alex's code and my code.
Testing setup -- kind of messy.