Finish first draft

test and evaluation not completed