Basic working
Merge pull request #3 from marshalllaw18/initial_setup

Basic working