Move pen drawing stuff into the pen tool