moving some things around to work better with and even more multimodal form