And now the trim stuff to the correct place, yay!