move things around correctly this time.