Added Basic Functionality Sans Tests
Merge branch 'feature/basic-functionality' into develop