I think we should just move it over there and tackle #23 afterwards