Basic code with few comments
Removed the test classes for now