Trimming

Included trimmer, and more