First draft complete
Updated index