And (oops) some enchanting api things are in this commit too