Second Version

Finalizing the Code. Todo Markup