I'm going to do this as part of #3