working on doc support; milestone 3