mostly done -- waiting for feedback