finished coding v2.0

Finished