Commit Five. Working out some more bugs.