Tons of copypaste/etc to get things done for v10. Needs to be abstracted over some traits, should clean up a ton of code.
