Still cruddy, but it works