Moves stuff to New()

Alright, I tested it, and this worked, so...