Finalizing Version 1 implementation

Things to be done: -
Add Unit Tests.
Complete HTML pages.