First draft complete
minor ammendments