move stuff around
more stuff removed