Flesh out, make more useful, add Insert support