Still doesn't work, added some minor docs