Started moving things over

Trying to keep things organized. :) Only a couple functions so far.