A little less borken but still not working