move some things around for better organization