Broke it all

It's not quite working correctly...