basic functionality added
Merge branch 'basic_functionality'