move some stuff to turn this in to a legit project