FInalized Code

Conducted tests.
TODO - Add comments
Test

Test