First version almost done. Add results