File structure changed; test written and test; documentation; etc.