Actually works more or less now