move things around + reduce vocab