rest done
v1.1! DONE