Did part B, but we still need to test it because we are lazy.  Version 2