I still need to do some work, but it's ready to be merged into master.