Final Revision of Design Doc