Moved around a lot, got rid of a lot. Lets fix this up.