More comments and WIP testing.