Still not working but we're in a good place now