Code update; output is ahead of the program.

Code now fits the spec I have in my head more. Soon I'll get around to finishing, probably at home instead of at school.