This looks a lot closer to actually working.