More WIP

"Code complete" (which is to say, I haven't tested a thing yet)