Feature comments and tests

Comments are ready.