moved stuff around and tested