Moving things around now that they're working