Final Commit

To be continued.............................. :P