We are leaving these here for the time being so I can make sure the structure of these don't become unwieldy again.