moved stuff to places it actually makes sense