commented some stuff out so tests run