Fundamentally works, needs minor debugging.

Make sure the columns line up.