Add a bunch more stuff based on Saju's advice