removing some stuff to get a better idea of whats needed