Updated: This works, I suppose