moved stuff
working on fixing views. not done