Initial Commit - wrote a few tests